Migrate to debhelper 9.

diff --git a/debian/compat b/debian/compat
index 7f8f011eb73d6043d2e6db9d2c101195ae2801f2..ec635144f60048986bc560c5576355344005e6e7 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9

diff --git a/debian/control b/debian/control
index 7f42ec0bea38076f55021aa1fc61bf23021821a0..1a5bca07287fd043bb911f3a2819ff2b6478d9ff 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: bsd-mailx | mailx, libncurses5-dev, texinfo, liblockfile-dev, lib
  libpng-dev, libjpeg-dev, libm17n-dev, libotf-dev,
  libgpm-dev [linux-any], libdbus-1-dev,
  autoconf, automake, autotools-dev, dpkg-dev (>> 1.10.0), quilt (>= 0.42),
- debhelper (>= 7.0.50~), libxaw7-dev, sharutils, imagemagick, libgtk-3-dev,
+ debhelper (>= 9), libxaw7-dev, sharutils, imagemagick, libgtk-3-dev,
  libgnutls-dev, libxml2-dev, libselinux1-dev [linux-any], libmagick++-dev,
  libgconf2-dev, libasound2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]
 Homepage: http://www.gnu.org/software/emacs/

diff --git a/debian/control.in b/debian/control.in
index 838ceabf1b335042ed24f8e461a5d4dfddca48e4..43e8e78b6bc8bee3fcf156cd69e60c1e0f37240a 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -7,7 +7,7 @@ Build-Depends: bsd-mailx | mailx, libncurses5-dev, texinfo, liblockfile-dev, lib
  libpng-dev, libjpeg-dev, libm17n-dev, libotf-dev,
  libgpm-dev [linux-any], libdbus-1-dev,
  autoconf, automake, autotools-dev, dpkg-dev (>> 1.10.0), quilt (>= 0.42),
- debhelper (>= 7.0.50~), libxaw7-dev, sharutils, imagemagick, libgtk-3-dev,
+ debhelper (>= 9), libxaw7-dev, sharutils, imagemagick, libgtk-3-dev,
  libgnutls-dev, libxml2-dev, libselinux1-dev [linux-any], libmagick++-dev,
  libgconf2-dev, libasound2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]
 Homepage: http://www.gnu.org/software/emacs/

diff --git a/debian/rules b/debian/rules
index 644055fe51456868bf1d7c9bd55bfc4fcf2cd62f..d6bc1f10ac9078f12b486a16c093cf6b67da7a8e 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@
 
 # Copyright 1994,1995 Ian Jackson
 # Copyright 2004-2005 Jérôme Marant <jerome@debian.org>
-# Copyright 1998-2012 Rob Browning <rlb@defaultvalue.org>
+# Copyright 1998-2013 Rob Browning <rlb@defaultvalue.org>
 
 # Originally copied from the GNU Hello Debian rules file (1.3).
 # Modified for emacs by Mark Eichin <eichin@kitten.gen.ma.us>.
@@ -100,10 +100,10 @@ endif
 
 deb_host_multiarch := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
-CFLAGS = `dpkg-buildflags --get CFLAGS`
+CFLAGS = $(shell dpkg-buildflags --get CFLAGS)
 CFLAGS += -Wall
-LDFLAGS = `dpkg-buildflags --get LDFLAGS`
-CPPFLAGS = `dpkg-buildflags --get CPPFLAGS`
+LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
+CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS)
 
 ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
   ifneq (,$(filter $(DEB_HOST_ARCH),ia64))